From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 11 Mar 2015 00:42:05 +0000 (+0100)
Subject: calendar: Also update expanded body if necessary
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1521
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4c7eae7ef2a15ae186cdcae89222613dda1bd74a;p=gnome-shell.git

calendar: Also update expanded body if necessary

As we use two separate body actors for expanded and unexpanded
notifications, updating only one of them on notification updates
is not enough - if the notification has already been expanded,
we need to update the second label as well.
---

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 7345ae006..67b757db2 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -1045,6 +1045,8 @@ const Message = new Lang.Class({
         this._bodyText = text;
         this.bodyLabel.setMarkup(text ? text.replace(/\n/g, ' ') : '',
                                  this._useBodyMarkup);
+        if (this._expandedLabel)
+            this._expandedLabel.setMarkup(text, this._useBodyMarkup);
     },
 
     setUseBodyMarkup: function(enable) {
@@ -1092,9 +1094,9 @@ const Message = new Lang.Class({
         this._actionBin.visible = (this._actionBin.get_n_children() > 0);
 
         if (this._bodyStack.get_n_children() < 2) {
-            let expandedLabel = new URLHighlighter(this._bodyText,
-                                                   true, this._useBodyMarkup);
-            this.setExpandedBody(expandedLabel.actor);
+            this._expandedLabel = new URLHighlighter(this._bodyText,
+                                                     true, this._useBodyMarkup);
+            this.setExpandedBody(this._expandedLabel.actor);
         }
 
         if (animate) {